make generate: improve reproducibility #4158
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Improve reproducibility by eliminating protoc-gen-go-grpc version strings Unblock PR 4129 Signed-off-by: Akihiro Suda <[email protected]>
jandubois
approved these changes
Oct 7, 2025
| # | ||
| # perl is used because `sed -i` is not portable across BSD (macOS) and GNU. | ||
| perl -pi -E 's@(^//.*)protoc[[:blank:]]+v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+@\1protoc version [omitted for reproducibility]@g' "$PB_GO" "$GRPC_PB_GO" | ||
| perl -pi -E 's@(^//.*protoc.*)[[:blank:]]+v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+@\1 [version omitted for reproducibility]@g' "$PB_GO" "$GRPC_PB_GO" |
Member
There was a problem hiding this comment.
Maybe I'm old-fashioned, but I find the \s and \d escapes more readable than the noisy POSIX character classes:
Suggested change
| perl -pi -E 's@(^//.*protoc.*)[[:blank:]]+v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+@\1 [version omitted for reproducibility]@g' "$PB_GO" "$GRPC_PB_GO" | |
| perl -pi -E 's@(^//.*protoc\S*)\s+v\d+\.\d+\.\d+@\1 [version omitted for reproducibility]@g' "$PB_GO" "$GRPC_PB_GO" |
Member
Author
There was a problem hiding this comment.
I feel single-character escapes are cryptic
Member
There was a problem hiding this comment.
If you find regular expressions cryptic, you can use the /x modifier to insert whitespace to break up the pattern into groups:
perl -pi -E 's@ (^//.*protoc.*) [[:blank:]]+ v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+ @\1 [version omitted for reproducibility]@gx' "$PB_GO" "$GRPC_PB_GO"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improve reproducibility by eliminating protoc-gen-go-grpc version strings
Unblock: